manual upstream merge

author Joakim Verona <joakim@verona.se>

Fri, 27 Jun 2014 10:10:03 +0000 (12:10 +0200)

committer Joakim Verona <joakim@verona.se>

Fri, 27 Jun 2014 10:10:03 +0000 (12:10 +0200)
author Joakim Verona <joakim@verona.se>
Fri, 27 Jun 2014 10:10:03 +0000 (12:10 +0200)
committer Joakim Verona <joakim@verona.se>
Fri, 27 Jun 2014 10:10:03 +0000 (12:10 +0200)
diff --cc lisp/desktop.el
Simple merge
diff --cc make-dist
Simple merge
diff --cc src/Makefile.in
Simple merge
diff --cc src/lisp.h
Simple merge
author	Joakim Verona <joakim@verona.se>
	Fri, 27 Jun 2014 10:10:03 +0000 (12:10 +0200)
committer	Joakim Verona <joakim@verona.se>
	Fri, 27 Jun 2014 10:10:03 +0000 (12:10 +0200)
		1	2
lisp/desktop.el	patch \|	diff1 \|	diff2 \|	blob \| history
make-dist	patch \|	diff1 \|	diff2 \|	blob \| history
src/Makefile.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/lisp.h	patch \|	diff1 \|	diff2 \|	blob \| history